Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

copy of Tour Mode Clean Develop 202403 #3904

Draft
wants to merge 90 commits into
base: develop
Choose a base branch
from

Conversation

beambot2
Copy link
Collaborator

@beambot2 beambot2 commented Oct 31, 2024

A copy created in an attempt to fix strange CI behavior


This change is Reviewable

zneedell and others added 30 commits April 26, 2023 11:15
# Conflicts:
#	production/austin
#	production/sfbay
#	src/main/scala/beam/agentsim/agents/PersonAgent.scala
#	src/main/scala/beam/agentsim/agents/household/HouseholdFleetManager.scala
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
#	src/main/scala/beam/agentsim/infrastructure/taz/TAZTreeMap.scala
#	src/main/scala/beam/router/skim/core/RideHailSkimmer.scala
…mode-clean-develop202403

# Conflicts:
#	production/seattle
#	production/sfbay
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala
#	src/main/scala/beam/router/skim/readonly/ODSkims.scala
zneedell and others added 23 commits October 15, 2024 16:06
…velop202403

# Conflicts:
#	src/main/scala/beam/agentsim/agents/PersonAgent.scala
#	src/main/scala/beam/agentsim/agents/modalbehaviors/DrivesVehicle.scala
#	src/main/scala/beam/agentsim/events/PathTraversalEvent.scala
…velop202403

# Conflicts:
#	src/main/scala/beam/agentsim/agents/parking/ChoosesParking.scala
#	src/test/scala/beam/agentsim/infrastructure/ZonalParkingManagerSpec.scala
…mode-clean-develop202403

# Conflicts:
#	build.gradle
@beambot2
Copy link
Collaborator Author

test!

availableVehicles,
choosesModeData.personData.currentTourPersonalVehicle
)
val (chosenTourMode, chosenTourVehicleMap) = chosenTourModeAndVehicle.headOption match {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are using headOption on a map here. Maps usually have random order. This means, we are returning a random value. If different behaviour is needed, some sorting might be needed.

trips: Vector[EmbodiedBeamTrip],
availableVehicles: Vector[VehicleOrToken] = Vector.empty[VehicleOrToken],
currentTourPersonalVehicle: Option[Id[BeamVehicle]] = None
): mutable.Map[Option[BeamTourMode], mutable.Map[EmbodiedBeamTrip, Option[BeamVehicle]]] = {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are returning a map here. The keys of this Map is Option[BeamTourMode]. But we are only putting Some objects there. So Option is not really needed here.

@beambot2
Copy link
Collaborator Author

beambot2 commented Nov 1, 2024

test!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants